From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 2 Nov 2017 00:55:09 +0000 (-0400)
Subject: Drop gdk_screen_get_display
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~938
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=3b7763eebcaf95911d830527cf5009db43e616af;p=gtk4.git

Drop gdk_screen_get_display

This is not longer used.
---

diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index d217508d93..2677575c6f 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -67,21 +67,3 @@ _gdk_screen_close (GdkScreen *screen)
       g_object_run_dispose (G_OBJECT (screen));
     }
 }
-
-/**
- * gdk_screen_get_display:
- * @screen: a #GdkScreen
- *
- * Gets the display to which the @screen belongs.
- *
- * Returns: (transfer none): the display to which @screen belongs
- *
- * Since: 2.2
- **/
-GdkDisplay *
-gdk_screen_get_display (GdkScreen *screen)
-{
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
-  return GDK_SCREEN_GET_CLASS (screen)->get_display (screen);
-}
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index c6a99fc05f..6bf456572e 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -40,8 +40,6 @@ G_BEGIN_DECLS
 
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
 
-GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
-
 G_END_DECLS
 
 #endif  /* __GDK_SCREEN_H__ */
diff --git a/gdk/gdkscreenprivate.h b/gdk/gdkscreenprivate.h
index b2f6e64acd..a1ab6cd672 100644
--- a/gdk/gdkscreenprivate.h
+++ b/gdk/gdkscreenprivate.h
@@ -38,8 +38,6 @@ struct _GdkScreen
 struct _GdkScreenClass
 {
   GObjectClass parent_class;
-
-  GdkDisplay * (* get_display)           (GdkScreen *screen);
 };
 
 G_END_DECLS
diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index 67a58a5623..d3001d5b8a 100644
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -280,12 +280,6 @@ display_reconfiguration_callback (CGDirectDisplayID            display,
     }
 }
 
-static GdkDisplay *
-gdk_quartz_screen_get_display (GdkScreen *screen)
-{
-  return _gdk_display;
-}
-
 static gint
 get_mm_from_pixels (NSScreen *screen, int pixels)
 {
@@ -300,10 +294,7 @@ static void
 gdk_quartz_screen_class_init (GdkQuartzScreenClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkScreenClass *screen_class = GDK_SCREEN_CLASS (klass);
 
   object_class->dispose = gdk_quartz_screen_dispose;
   object_class->finalize = gdk_quartz_screen_finalize;
-
-  screen_class->get_display = gdk_quartz_screen_get_display;
 }
diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index 3fda74a2f3..25320d10df 100644
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -172,12 +172,6 @@ _gdk_win32_screen_set_font_resolution (GdkWin32Screen *win32_screen)
     _gdk_screen_set_resolution (screen, logpixelsx);
 }
 
-static GdkDisplay *
-gdk_win32_screen_get_display (GdkScreen *screen)
-{
-  return _gdk_display;
-}
-
 GdkWindow *
 gdk_win32_screen_get_root_window (GdkScreen *screen)
 {
@@ -194,9 +188,6 @@ static void
 gdk_win32_screen_class_init (GdkWin32ScreenClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkScreenClass *screen_class = GDK_SCREEN_CLASS (klass);
 
   object_class->finalize = gdk_win32_screen_finalize;
-
-  screen_class->get_display = gdk_win32_screen_get_display;
 }
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 7d5e954843..8506e4ba2f 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -73,12 +73,6 @@ gdk_x11_screen_init (GdkX11Screen *screen)
 {
 }
 
-static GdkDisplay *
-gdk_x11_screen_get_display (GdkScreen *screen)
-{
-  return GDK_X11_SCREEN (screen)->display;
-}
-
 GdkWindow *
 gdk_x11_screen_get_root_window (GdkScreen *screen)
 {
@@ -1269,13 +1263,10 @@ static void
 gdk_x11_screen_class_init (GdkX11ScreenClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkScreenClass *screen_class = GDK_SCREEN_CLASS (klass);
 
   object_class->dispose = gdk_x11_screen_dispose;
   object_class->finalize = gdk_x11_screen_finalize;
 
-  screen_class->get_display = gdk_x11_screen_get_display;
-
   signals[WINDOW_MANAGER_CHANGED] =
     g_signal_new (g_intern_static_string ("window-manager-changed"),
                   G_OBJECT_CLASS_TYPE (object_class),